Add support for MXF, from Alex Mottram <alex_m@cox-internet.com>

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 9eeabe5bdff52c404134e9074fa24ff0ad674248..1f18325bd3ecf1e818b9bf1cae3cdd6460820394 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -1,8 +1,8 @@
-CFLAGS=-g -Icoldsync
+CFLAGS=-belf -g -Icoldsync -I/usr/local/include -L/usr/local/lib
 
 FMTS=magproto.o gpx.o geo.o gpsman.o mapsend.o mapsource.o \
        gpsutil.o tiger.o pcx.o csv.o cetus.o gpspilot.o magnav.o \
-       psp.o
+       psp.o mxf.o
 
 OBJS=main.o queue.o route.o waypt.o util.o vecs.o mkshort.o \
        coldsync/util.o coldsync/pdb.o $(FMTS)

diff --git a/gpsbabel/README b/gpsbabel/README
index 6c23b32ff2f4f8ec3f3569c2b10c048f670633be..194820d67e3ca5a69fe5f69a7a1f9e675aa7c493 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -114,6 +114,9 @@ THE FORMATS
        .MPS files.  Unfortunately, you need one .PSP file for every 
        .MPS file. :(
 
+  Maptech MXF
+       Maptech's MXF is a CSV on steroids.  Contributed by Alex Mottram.
+
 
 COMMON USAGE
 

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 0bcc451af8676dbc1684afb06e86ea96011b34f1..30862b79b3f27bc5517e4651b0634db4c703dd7f 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -59,3 +59,7 @@ diff /tmp/magfile reference/magfile
 ${PNAME} -i geo -f geocaching.loc -o psp -F /tmp/ps.psp
 diff /tmp/ps.psp reference
 
+# MXF (Maptech Exchange Format) file format
+${PNAME} -i mxf -f mxf.c -o mxf -F /tmp/mxf.mxf >/dev/null
+diff /tmp/mxf.mxf reference
+

diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index ac044a4494dd13d80c79b955d1f8a0c282aa138e..9d103a00a893cc8c5d226e649bdea4907bddb243 100644 (file)
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -41,6 +41,7 @@ extern ff_vecs_t csv_vecs;
 extern ff_vecs_t cetus_vecs;
 extern ff_vecs_t gpspilot_vecs;
 extern ff_vecs_t psp_vecs;
+extern ff_vecs_t mxf_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -110,6 +111,11 @@ vecs_t vec_list[] = {
                "GPSPilot Tracker for Palm/OS"
        },
        {
+               &mxf_vecs,
+               "mxf",
+               "MapTech Exchange Format"
+       },
+        {
                NULL,
                NULL,
                NULL